From f9e7b1763c8706470c1c490dcec30829fc74f5d2 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 21 Jan 2008 13:08:44 +0000 Subject: [PATCH] x86, xenoprof: Support Intel Penryn processors. Signed-off-by: Xiaowei Yang =20 --- xen/arch/x86/oprofile/nmi_int.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c index 09549caa09..7fb72eb718 100644 --- a/xen/arch/x86/oprofile/nmi_int.c +++ b/xen/arch/x86/oprofile/nmi_int.c @@ -295,17 +295,16 @@ static int __init ppro_init(char ** cpu_type) { __u8 cpu_model = current_cpu_data.x86_model; - if (cpu_model > 15) { + if (cpu_model == 15 || cpu_model == 23) + *cpu_type = "i386/core_2"; + else if (cpu_model == 14) + *cpu_type = "i386/core"; + else if (cpu_model > 13) { printk("xenoprof: Initialization failed. " "Intel processor model %d for P6 class family is not " "supported\n", cpu_model); return 0; - } - else if (cpu_model == 15) - *cpu_type = "i386/core_2"; - else if (cpu_model == 14) - *cpu_type = "i386/core"; - else if (cpu_model == 9) + } else if (cpu_model == 9) *cpu_type = "i386/p6_mobile"; else if (cpu_model > 5) *cpu_type = "i386/piii"; -- 2.30.2